From: iap10@labyrinth.cl.cam.ac.uk Date: Thu, 23 Sep 2004 16:27:34 +0000 (+0000) Subject: bitkeeper revision 1.1159.83.1 (4152f976-8zbYss32IZrnHKQS9VCaw) X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17400^2~574^2~7 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=17e73d2dd280452ea84b8e007d4a845c1980dba9;p=xen.git bitkeeper revision 1.1159.83.1 (4152f976-8zbYss32IZrnHKQS9VCaw) minor migration cleanup --- diff --git a/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c index bc3d236326..26aa52cae6 100644 --- a/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c @@ -208,16 +208,14 @@ static int vif_wake(struct net_device *dev) { struct sk_buff *skb; u32 src_ip, dst_ip; - unsigned char dst_hw[ETH_ALEN]; - - memset(dst_hw, 0xff, ETH_ALEN); dst_ip = INADDR_BROADCAST; src_ip = inet_select_addr(dev, dst_ip, RT_SCOPE_LINK); - skb = arp_create(ARPOP_REQUEST, ETH_P_ARP, + skb = arp_create(ARPOP_REPLY, ETH_P_ARP, dst_ip, dev, src_ip, - dst_hw, dev->dev_addr, NULL); + /*dst_hw*/ NULL, /*src_hw*/ NULL, + /*target_hw*/ dev->dev_addr); if ( skb == NULL ) return -ENOMEM; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ec27a5eb8d..ade285129c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -223,12 +223,12 @@ void arch_do_createdomain(struct domain *d) virt_to_phys(&machine_to_phys_mapping[0])>>PAGE_SHIFT; SHARE_PFN_WITH_DOMAIN(virt_to_page(d->shared_info), d); machine_to_phys_mapping[virt_to_phys(d->shared_info) >> - PAGE_SHIFT] = 0x80000000UL; /* debug */ + PAGE_SHIFT] = INVALID_P2M_ENTRY; d->mm.perdomain_pt = (l1_pgentry_t *)alloc_xenheap_page(); memset(d->mm.perdomain_pt, 0, PAGE_SIZE); machine_to_phys_mapping[virt_to_phys(d->mm.perdomain_pt) >> - PAGE_SHIFT] = 0x0fffdeadUL; /* debug */ + PAGE_SHIFT] = INVALID_P2M_ENTRY; } int arch_final_setup_guestos(struct domain *d, full_execution_context_t *c) diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c index ea73908a96..84c7ade98c 100644 --- a/xen/arch/x86/memory.c +++ b/xen/arch/x86/memory.c @@ -1802,6 +1802,12 @@ static __init int ptwr_init(void) (void *)alloc_xenheap_page(); ptwr_info[i].ptinfo[PTWR_PT_INACTIVE].page = (void *)alloc_xenheap_page(); + machine_to_phys_mapping[virt_to_phys( + ptwr_info[i].ptinfo[PTWR_PT_ACTIVE].page)>>PAGE_SHIFT] = + INVALID_P2M_ENTRY; + machine_to_phys_mapping[virt_to_phys( + ptwr_info[i].ptinfo[PTWR_PT_INACTIVE].page)>>PAGE_SHIFT] = + INVALID_P2M_ENTRY; } return 0; diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 2d399bded7..cd565d8dcc 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -116,6 +116,8 @@ struct pfn_info spin_unlock(&(_dom)->page_alloc_lock); \ } while ( 0 ) +#define INVALID_P2M_ENTRY (~0UL) + extern struct pfn_info *frame_table; extern unsigned long frame_table_size; extern unsigned long max_page;